adding full tracking system