Tables are now handled much better