Prepare rework