Refactored + text field.