renaming --delay-in-s to --delay and --timeout-in-ms to --timeout