made validation changes