validation
final validation changes