Alternative Options for #1040360