put in proper validation again