Lot of changes
Controller class changed