Added some cases