Refactor wcs to use six