fancy effects and some reorg