Those New Comments Rules Again

Sorry for the hassle. Please use your real first and last name and put an email address. Commit!