Tables rework