Comm.cpp rework required