preliminary update of views for new model structure