Updated with form submit