improve enumeration on the top - again