Sorry for all the pull requests!!

fixed the way conditions are assigned in the data...