Alternative Options for #1030780