Update to v6.04