add corner_cases