No more PI magic please.