model and validation changes 2