controllers and views modified