Rework with composition system