Alternative Options for #961462