Added GPS code into Client