Rework with some more rework