add conditinalValidation check