completely new barrier implementation, addressing major correctness issues