controller final changes