update to form and controller