model and validation changes 3