Some new functions for waypoints