change logic for --raw