Switching to diagrams 1.2