Alternative Options for #476622