Update to lexicon

generalizing location