final validation changes