Changed over to raw output. life is better