Uncommitted changes. Including contour_image changes.