redesign update flow; test it.