Fixing up communication section