Model rework