updated form helper