implementation of map and waypoint
MERGE