Finished the changes in Tracking Module.