Added some edge cases