merged client complete and common.h updated