Now my version! Am I all correct with the diagram?