move tracking to Utils