Reworking tables a bit