Tables imporoved