Adding John's changes