Added some other cases