Jon: merged Rashmi's code
Jon: merging Rashmi's tabs