apdated with validation changes