Alternative Options for #959700