Alternative Options for #740635