Rework, again