Made big diagram changes