Added John's changes in