+new form + bug fix