got rid of buggy table nesting, using more simplified table