Changes based upon Naomi's comments 2