Update refactoring
Update refactoring 2