Update to v2.1