Added option to leave out full data set