Update with John's fixes to my commit