Almost have version 2 at parity with version 1