Alternative Options for #1078915