Started to add functionality for SNR