tables rework (start)