Updated to include correct fence calculations in relevant methods