pi-based changes