Go back to using Location in STManager