Wang's commit of CPSC version