Merging in Colin's change