update to work with all routes.