changed controller stuff