Update to v3. Not 100% sure this works yet