[feature] improved tracking system