Added getting location