#36, modified UML