changed models and controllers