completed transition to model-view based paradigm