More work on tabbing