Moved normalization to a seperate job