Added safe mode back in for now