updated-server and gui