Antenna :: reworked demultiplexing