refactoring: convert waypoints to real list