Changed just a bit
Included the new spot for form
Survey for class