added: Safe Mode, Note: WIP
manual merge