changed action controller and response flow