Diagrams and UC changed

Good enough version :)