rework of tables