table and plot improved