reworked the routes