Updated for signal and noise