a bit of mods to how we do the tables.