more logic variable reorg