John's changes