Simplify and optimise comms.