added tel-o-fun, waypoints