slimmed down some of the tables