Added GPS functionality (2)