refactor on trackers