Added/Changed some of the code for chatting