Add timeout/increase accuracy