Creating new controllers
A few changes