improve on the table/table type situation