Cleaned up code
Changed controller
Changed controller