update models and controllers
more updates