improvements in form
merge conflicts