Rewrite some parts of the communication section