Alternative Options for #830460