added --yes options to avoid interactive prompt