changed model and controller back to original