Enabled Logging
Merge branch 'new-server'