And reworked yet again...