Revert "Revert "Revert "included the rest of the tables"""

This reverts commit b25ef90808eb8207f42616c1bf63359fa72fbf86.