More work on the tables