added --non-interactive