updated controller, routes