Reorg to handle variable name problem