Changes based upon Naomi's comments