added several new cases