Lazy numbering and more detail