Alternative Options for #890784