Update to Normalize 2.1.0