added location awareness