Added tagger, started reordering