added model and seed
merged conflicts