added conditions for words ending with "--"