Added some more cases