SiPSAP Optimization