updated controllers, too