new barrier works, still ~2 bugs