Get --raw working