Upgrading forms to new standard.