Update to v3.1