updated for uri option.