Add normalization (not extensively tested)