refactor to TrackSet