Working reorg of input