Update normalize, etc