tab B added. minor functionality improvements