More changes
Reorg and combine with paper