updated controller
Updated comments