changed generator for new format forms