worked on signaling process
Merge conflict solved