More work on lexicon