added location stuff.