khloud fixed code and UML