Added EDGE_CASE highlighting