implementation rework