Waypoints now work a lot more naturally