More work on matching tab