improve enumeration on the top