Changed (again) the way forms are built