Revert "Revert "updated server""

This reverts commit 7a321099e13a7d8ef18500c59b55f084a48f4383.