further changes for field-choice