updating logic a bit, still doesnt auto track, sigh