Update to normalize 3.0