Updating form_functions to new branch