Updated Demodulator