Continuing the rework