               (time2 "proj" (pca-project mat pca)))
 
       :base-clusters
-            (plmb/fnk [conv rating-mat proj opts']
+            (plmb/fnk [conv rating-mat proj in-conv opts']
               (time2 "base-clusters"
                 (greedy
-                (sort-by :id
-                  (kmeans (assoc rating-mat :matrix proj)
-                    (:base-k opts')
-                    :last-clusters (:base-clusters conv)
-                    :cluster-iters (:base-iters opts'))))))
+                (let [proj-mat (assoc rating-mat :matrix proj)
+                      in-conv-mat (rowname-subset proj-mat in-conv)]
+                  (sort-by :id
+                    (kmeans in-conv-mat
+                      (:base-k opts')
+                      :last-clusters (:base-clusters conv)
+                      :cluster-iters (:base-iters opts')))))))
 
        :group-clusters
             (plmb/fnk [conv rating-mat base-clusters opts']

(defn conv-update [conv votes & {:keys [med-cutoff large-cutoff]
                                 :or {med-cutoff 100 large-cutoff 1000}
                                 :as opts}]
  (try
    (let [ptpts   (:rows (:rating-mat conv))
          n-ptpts (count (distinct (into ptpts (map :pid votes))))]

                               {:tid tid
                                :A (agg-bucket-votes-for-tid bid-to-pid rating-mat agree? tid)
                                :D (agg-bucket-votes-for-tid bid-to-pid rating-mat disagree? tid)})
                             tids)))))
       ; End of large-update
       }))

