add sync; more reorg