Adding corner cases