Added changes to get punctuations correct