New trust logic. Shelter fix