Adding the option to generate the inner waypoints