model and validation changes