Updates by JRI