Made changes to calculate normalization and store to the model
Also added normalizationn to predictor