added validation
updated