small changes
Before changing Communication system...