Updated code for tracking V2 (from Y. Belikov)