reorg
version 2; leaner