updated-server and gui-2