Rewrite so that right hand is composing hand, left hand is volume
Fixed merge conflicts