second commit: controller