Rework logic