Make normalization conditional

Steven - is this better?