code validation changes