added validation on server side. renaming