safety() greatly improved