Alternative Options for #524790