Alternative Options for #652000