more work ... intermediate commit again...