added all of Corrie's comments