Use waypoints anyway?