adding tracked
marking some ase removed and adding changes