Updated with -o originals option