Adjust the logic of tracking. NOT DEBUGGED

NOT DEBUGGED