Future rework