Alternative Options for #642704