added changes
Changed controller