Adding functionality to work with just one waypoint