Fixed the script to include the new form fields