Fixed code changes regarding filed input
merge conflicts