adapting to Patchboard rewrite