Updated to v2 (5145e2e6373dcac4e8c8fd84965a6ac6c1a62497)