inkked defaluts on new form
minor view modification
merge resolution