Changes to chat.java