More changes from John