Alternative Options for #606036