More changes for tracking