Added normalization of values