updated form to version 2.1 and up