added new forms and jsorolla changes