working version, need to remove old normalization now