added some more validation
updated validation again