updated form setup