Full rework, 3rd pass