upgraded the routes some