move tracking back into the tracker