Changed Location service slightly