Update with working tabs