total reorg .. as told by Z.Shaw
tests in prog