Updated Controller

- Added some restrictions.