Updates to v4.0