Validation
more changes