re-macked the routes