added raw output flag