Added better tracking