CFY-1484 add nir's comments