figs added
8.4 added
conflict resolved