Updated the listener and transmitter with the newest code