Further updates to deal with the form_for update