Two step reindexing

Quick r?