Alternative Options for #517664