Changed the routes to make some of the stuff simpler