added raw option