Changes to the model

Just a couple of alterations.