Better update form
stupid merge file