Updated to the latest server code