synchronize with local res
Refactoring