added extra layer for waypoints