replaced userId with connectionId