changing on submit and on click events