Updated diagrams from Thomas