Refactorings
Stable with UDP