Updated submit functions for to include more variables