Annotated the code, updated class diagram