Update to v4.0