refacroting comms
fixing merge conflicts