renumber
more introspection