Update all -  Big Refactoring