added diagram
merged