added OSC comm
fixed merge conflict