Alternative Options for #728580