Improve modifywarp