current, tracking better now