Issue #41 removed corrupt UML added new ones