reworked data method