updated models and controllers