New version based on PCSS