Updated the tracking using the location manager, not Alpha Tested yet