Add logic to keep punctuation