Alternative Options for #796888