New version for the UML thing.