updated corner cases