improved method names, updated diagrams