           selectedId={@state.selectedThreadId}
           stack={stack}
           machines={stack.get 'machines'}
+          onStackRendered={@bound 'onStackRendered'}
           />
 
     return stackSections
 
 
-  renderSharedVMs: ->
+  renderSharedMachines: ->
 
-    return null  if @state.sharedMachines.size is 0
+    machines =
+      shared        : @state.sharedMachines
+      collaboration : @state.collaborationMachines
 
-    <SidebarStackSection
+    return null  if machines.shared.size is 0 and machines.collaboration.size is 0
+
+    <SidebarSharedMachinesSection
       sectionTitle='Shared VMs'
-      titleLink='/SharedVms'
+      machines={machines}
+      renderedStacksCount={@state.renderedStacksCount}
       />
 
 

    actions.channel.loadFollowedPrivateChannels()


  renderStacks: ->

    stackSections = []

  render: ->
    <Scroller className={kd.utils.curry 'activity-sidebar', @props.className}>
      {@renderStacks()}
      {@renderSharedMachines()}
      {@renderChannels()}
      {@renderMessages()}
    </Scroller>
