Use fancy new form macro