Added Controller, Bugfix