added some UML changes as a seperate file this time