updating files, removed model_expression