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

This reverts commit 261a8092649e44bddb0a3333ad1ec9f1daf659c4.