Removed passing of controller again
Improved controls