Added some new cases