Added -C and -n.