Address Doug's comments