Added dynamic condition (but need to sort out condition selection (currently using || operator). Prevented some implicit variable calls. Added cumulative to data.