More work on the rework