code review changes
Merge pull request #1174 from john-hill/tables-v2-b

code review changes