Normalize Update
Merge
Normalize update