Correct/improve diagram