some changes to model definition, add restricted set of methods for results plotting