Added two new cases