More pi-readiness