updated data gen stuff