More simple changes from Jon Forrest
And more Jon Forrest changes