updated to version 7
first step on reorg