Bug fixing with routes and points
Merged
Merge