refactor data gen to actual data