Rework of riftwarp