moved some location stuff