refactored tracking no lookup