add Colin's changes