added second form, redid type