Refactoring options + adding raw opening mode