Implementing auto-normalization in progress