Server side update
Refactoring
new commit