more validation
merged