toggle tracking button working better