#164 "last line defense" improved (but some new functions are disabled)