tracking improvements