Alternative Options for #522094