monte-carlo compatible now; added lots of data