Alternative Options for #825249