Updated paper, figs