Simplified the paths, added waypoints