Alternative Options for #1035644