fixed new form structure