updated waypoint and utilities