fixup for generation of data and some stuff related with agree of data