Added assumption of raw data