Issue #3943: Modify update methods, and ease