updated validation rules