added missing nums
fixin conflicts