data gen working fully