Alternative Options for #661161