More overhaul work on Client's Communication.