New inputfield
merge conflicts resolved