controller and models modified