remake figs, in light of code edits