some minor to major changes to the form according to anthony