Reorg and adds options