ugly addition of channels
a bit of breaking up sources