added better tracking