This is John's twelf edit