modified channel-server