Changes per review by Bobbi