added tracking for live only