User location no longer hard-coded