Reworked the model a bit.