Integrate John's changes