Improve warping, remove trace