added location stuff