Doing some rework