Updating and refactoring