new forms and lots of changes