added raw, added routing