Started putting back validation.