Warp system improvements