Alternative Options for #816089