Updated UML and removed some unncessesary variables