minor re-factoring of calls to model