Started replacing diagrams