Incorporate review changes from Chris