Modified onLocationChanged AGAIN