new tracking logic
new tracking logic