server.java changes