New uniformization code seems to be working.