added --safe-mode