Full rework, second pass