use the new table structure