reorg and add expression calc