Alternative Options for #929634