Modified parameters, added more flexibility to waypoint capturing