Updates w/ Godfrey's suggestions