add some validation
add some validation