Added edge cases