Server updated to communicate correctly with client