edge_case added