corresponding to draft 8, tweaked some of the figure generation code...