revised homonyms checking.