Add safe mode
Add safe mode