revisions to match options supported in latest