Client's communication overhauled.
Fixed conflict