rework model in progress