more improvement in figures