Repair and refactor Transmission functions