Change some Comment and test Email