Alternative Options for #959083