Made changes per Colin's CR