My changes by John