Almost done with Edit/Update