refactored server utils
refactored server utils
Merge remote-tracking branch 'origin'