Change to make Gill-to-conventional correct, and also clearer