new controllers, template changes