UPDATED FOR COMMS HACK YO