CommSolver modifications