Minor Changes to accommodate Multiplexing