Changed Warp function to fit new style