Changed the methods of the communication handler