Changed model, generated data
Added data gen
Added data gen