changed controller style
rolled back changes