Alternative Options for #796879