make changes to waypoint calc