reorganized form code