Finish the rework