Fixed Up the Waypoints System