modified Client.java