Unit rework