Pi task improvement