Streamlined and simplified comms code