updated controllers and models