Merge
Updated to 1950