Initial changes for Contour