Alternative Options for #669934