worked on correctness of model and separated files