changed to fit UML