Added calculateDistanceAngle magic