Updated mass track handling