Changes to better fit data generation