Alternative Options for #678724