Merged things from reorg