more update simplifications