Lexicon is working nicer now