return raw data, tweaks to waterfall