Merging two changes from Colin