Roger fronted more of the model definition, and added a different type of figure.