improve -r option