up to extract-wf
extract-wf, rect feels suspicious...