More improvements in update