Modified updateWaypointList()