Added safe mode.