controller class modified