DEFENSIVE improvements