updating based on Chris's comments