changed && to || for validation