Full rework, 4th pass