controllers and models modified