change to model/view instead of view/display