reworked some of the model files