updates
updated controller
merging