Updated to do SWLW zero points as well