Alternative Options for #622806