Change the way Barriers work to improve S2W/S2S