Added some additional cases.