updated controller modification