D2
[C1] Details
[C1] More fixes
[C1] Final
Rework fixes
More rewriting