Work on tab rewrite