Roll back code to v6.00