updated controller