combined controller with other files