Updated Normalize to current version