some more solutions, reorg