Some chamges to diagram