Changed the way contollers work