updated controller
updated controller