Updated to v6.1