Waypoint commit. Do not use