CTD Waypoint code changes