Another shot on encoding change.