Added more corner cases