Updates to v6.0