Redesign comm part two ! by @PosMeh