Alternative Options for #863361