Changed the model as part of issue #88