Updated the files for the final working forms.