Building tables with etc - works again