modified controller and views