added validation again