Changed calculation to correctly exchange points