changes for validator