Update for tab behavier