rework variable naming for sample_field