Add rise up and warp (warp not yet)