More prototyping of diagram