Some general update refactoring: