Alternative Options for #220614