delta reworked. comments restructured