edited application_controller