Re added form functionality