New normalization method, no need for hacks anymore