Merging in Colin's changes