updates for fast tracking
updates for fast tracking