Changed controllers for better testing