some changes in design. listener configuration changes