udpated validation