changed locations to keywords