Rework design