re-enabled opts stuff