changes from John