Figures improvements