Updated to contour 2.5.0