Rewriting marker logic for new dataset.