added location support
added location support