changes to makeTable and others