Alternative Options for #960004