This is now done in the Controller class