model rework continued