structure of model was improved