Tweaking to work on all form fields