more tracking changes