Reverted last change to use the cwfd