ActivityTracker final commit