use the new changes in contour-fw