Ruda's multiplex updates

Ruda's code, reviewed, with simple style changes.