added removable tab support