refactored and new signaling channel added