Added option for normalization.