Added more edge cases