BUG:  Wasn't separating out the different modalities.