Added S/N differentiation