Updated with watchPosition call