some modifs and tracker