Figs. 3C/3D: Changed to current tracking