Alternative Options for #1173079