Added some more cases
Merge