updated and worked on forms