added ability to switch data sets