changes to model, inheritance