Alternative Options for #737483