made some more changes to the model structure