Alternative Options for #546743