simplify
added raw data support