Mark's Edits on ServerCommunicationHandler