Update to normalize v2.1.1