These are the first changes to diagrams and fixes #2