edit by eyal--raw_sample