CHANGE: Improve the PIA performance