datagrid: REFACTORING V2