One last round rework